Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.6.0 #601

Closed
wants to merge 63 commits into from
Closed

Release 0.6.0 #601

wants to merge 63 commits into from

Conversation

smurfix
Copy link
Contributor

@smurfix smurfix commented Aug 13, 2018

No description provided.

pquentin and others added 30 commits July 20, 2018 14:28
This should never happen in normal use, but sometimes there are bugs
that can cause the init task to crash. (For example, I hit this while
trying to debug python-triogh-550.) Previously, this would trigger an assertion
failure, and the original exception would be lost. Let's preserve the
original exception to make debugging easier.
Add python 3.7 to the appveyor test matrix
Travis MacOS is much more functional than it used to be, and on
ci.cryptography.org we're hitting:
  MagicStack/immutables#7

So let's try turning on Travis's MacOS and see how it goes, while
scaling back our Jenkins testing so that bug doesn't block everything.
Enable MacOS testing on Travis, disable 3.6 testing on Jenkins
Also an excuse to force the tests to re-run so I can merge this.
While the Travis MacOS infrastructure is clearly *much* better than it
used to be, doing these tests on Jenkins is still faster overall, and
it avoids hitting python-triogh-584.

This commit:

- adds a temporary workaround for
  MagicStack/immutables#7
- re-enables all MacOS builds on Jenkins
  - including 3.7, which was previously not enabled
- re-disables Travis MacOS builds
Switch back to Jenkins for MacOS builds
@codecov
Copy link

codecov bot commented Aug 13, 2018

Codecov Report

Merging #601 into release will increase coverage by 0.04%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           release     #601      +/-   ##
===========================================
+ Coverage    99.27%   99.31%   +0.04%     
===========================================
  Files           89       91       +2     
  Lines        10617    10822     +205     
  Branches       747      753       +6     
===========================================
+ Hits         10540    10748     +208     
+ Misses          59       56       -3     
  Partials        18       18
Impacted Files Coverage Δ
trio/__init__.py 100% <ø> (ø) ⬆️
trio/_highlevel_open_tcp_listeners.py 100% <ø> (ø) ⬆️
trio/_core/tests/test_windows.py 100% <ø> (ø) ⬆️
trio/_core/_io_windows.py 78.28% <ø> (+1.19%) ⬆️
trio/_ssl.py 100% <ø> (ø) ⬆️
trio/_core/__init__.py 100% <ø> (ø) ⬆️
trio/_socket.py 100% <100%> (ø) ⬆️
trio/_core/_ki.py 100% <100%> (ø) ⬆️
trio/tests/test_sync.py 100% <100%> (ø) ⬆️
trio/_core/tests/test_run.py 100% <100%> (ø) ⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c7e268...fa219b7. Read the comment docs.

@pquentin
Copy link
Member

Thank you, @smurfix!

Do we want to wait for #598 to be merged before including it in the release?

@smurfix
Copy link
Contributor Author

smurfix commented Aug 13, 2018

598 is already part of his.

@pquentin
Copy link
Member

@smurfix That was my point, we included a commit in the release that has not been approved yet

@njsmith
Copy link
Member

njsmith commented Aug 14, 2018

Remind me again if there's any reason for having a release branch? I've never seen this in any other project. This is what tags are for, right?

My inclination is to close this and delete the branch unless there's a good reason not to.

@pquentin
Copy link
Member

pquentin commented Aug 16, 2018

I guess the main benefit is that you can easily see on GitHub all the commits that will make it into the release. I think using two branches (develop/master or master/release here) is pretty standard in the corporate world: this workflow is named Gitflow. But that does not mean we have to adopt it

@smurfix thoughts?

@pquentin
Copy link
Member

(It's also surprising that trio was released even though this pull request has not been merged yet)

@njsmith
Copy link
Member

njsmith commented Aug 18, 2018

Huh, I forgot that gitflow actually does this.

Reading through some of the posts about it, I think their release branch stuff is designed to support a slow-release workflow, where the mainline development branch isn't always releasable, releases are rare, and each release involves some stabilization ceremony. And also maybe your git repo is your release distribution mechanism, rather than using something like PyPI. That's a valid approach, but I'd rather move more towards a quick-release low-ceremony model (like we discussed some in #220), and the canonical way to get our latest release is to check PyPI, so a release branch is redundant (violates DRY). So... I don't think having a release branch provides much value here.

@pquentin
Copy link
Member

pquentin commented Aug 18, 2018

Sounds good 👍

So that means we should close this PR and delete the release branch? (edit: oh, that's waht you said above!)

@njsmith
Copy link
Member

njsmith commented Aug 28, 2018

This has been sitting for a while with no followups, so I guess I'm going to go ahead and do what I said!

@njsmith njsmith closed this Aug 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.